Fix xenstore entry accounting

xenstored is incorrectly accounting domain nodes when transactions
fail. Store pending count changes in the transaction structure, and
apply at transaction completion, instead of directly applying the
changes.

Signed-off-by: Max Zhen <max.zhen@sun.com>

diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c
index f59ec31d56a596f3110b72049fd5167d270543ef..6df0c32c64222849247c61175c328ab2c1298321 100644 (file)
--- a/tools/xenstore/xenstored_domain.c
+++ b/tools/xenstore/xenstored_domain.c
@@ -576,12 +576,21 @@ void domain_entry_inc(struct connection *conn, struct node *node)
                return;
 
        if (node->perms && node->perms[0].id != conn->id) {
-               d = find_domain_by_domid(node->perms[0].id);
-               if (d)
-                       d->nbentry++;
-       }
-       else if (conn->domain) {
-               conn->domain->nbentry++;
+               if (conn->transaction) {
+                       transaction_entry_inc(conn->transaction,
+                               node->perms[0].id);
+               } else {
+                       d = find_domain_by_domid(node->perms[0].id);
+                       if (d)
+                               d->nbentry++;
+               }
+       } else if (conn->domain) {
+               if (conn->transaction) {
+                       transaction_entry_inc(conn->transaction,
+                               conn->domain->domid);
+               } else {
+                       conn->domain->nbentry++;
+               }
        }
 }
 
@@ -593,11 +602,36 @@ void domain_entry_dec(struct connection *conn, struct node *node)
                return;
 
        if (node->perms && node->perms[0].id != conn->id) {
-               d = find_domain_by_domid(node->perms[0].id);
-               if (d && d->nbentry)
-                       d->nbentry--;
-       } else if (conn->domain && conn->domain->nbentry)
-               conn->domain->nbentry--;
+               if (conn->transaction) {
+                       transaction_entry_dec(conn->transaction,
+                               node->perms[0].id);
+               } else {
+                       d = find_domain_by_domid(node->perms[0].id);
+                       if (d && d->nbentry)
+                               d->nbentry--;
+               }
+       } else if (conn->domain && conn->domain->nbentry) {
+               if (conn->transaction) {
+                       transaction_entry_dec(conn->transaction,
+                               conn->domain->domid);
+               } else {
+                       conn->domain->nbentry--;
+               }
+       }
+}
+
+void domain_entry_fix(unsigned int domid, int num)
+{
+       struct domain *d;
+
+       d = find_domain_by_domid(domid);
+       if (d) {
+               if ((d->nbentry += num) < 0) {
+                       eprintf("invalid domain entry number %d",
+                               d->nbentry);
+                       d->nbentry = 0;
+               }
+       }
 }
 
 int domain_entry(struct connection *conn)

diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h
index d1ad774148a380feee61ca9d986e7ac13819bbac..69fdb77c1a9e9625e84c42c5487724632f86bdd4 100644 (file)
--- a/tools/xenstore/xenstored_domain.h
+++ b/tools/xenstore/xenstored_domain.h
@@ -55,6 +55,7 @@ bool domain_is_unprivileged(struct connection *conn);
 /* Quota manipulation */
 void domain_entry_inc(struct connection *conn, struct node *);
 void domain_entry_dec(struct connection *conn, struct node *);
+void domain_entry_fix(unsigned int domid, int num);
 int domain_entry(struct connection *conn);
 void domain_watch_inc(struct connection *conn);
 void domain_watch_dec(struct connection *conn);

diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c
index cf10ecc34867ebff1ebd7dc6a51fd8533b2d3a2d..02703013967a7078270c57443261ecb3c3e9105f 100644 (file)
--- a/tools/xenstore/xenstored_transaction.c
+++ b/tools/xenstore/xenstored_transaction.c
@@ -32,6 +32,7 @@
 #include "list.h"
 #include "xenstored_transaction.h"
 #include "xenstored_watch.h"
+#include "xenstored_domain.h"
 #include "xs_lib.h"
 #include "utils.h"
 #include "xenstored_test.h"
@@ -48,6 +49,18 @@ struct changed_node
        bool recurse;
 };
 
+struct changed_domain
+{
+       /* List of all changed domains in the context of this transaction. */
+       struct list_head list;
+
+       /* Identifier of the changed domain. */
+       unsigned int domid;
+
+       /* Amount by which this domain's nbentry field has changed. */
+       int nbentry;
+};
+
 struct transaction
 {
        /* List of all transactions active on this connection. */
@@ -65,6 +78,9 @@ struct transaction
 
        /* List of changed nodes. */
        struct list_head changes;
+
+       /* List of changed domains - to record the changed domain entry number */
+       struct list_head changed_domains;
 };
 
 extern int quota_max_transaction;
@@ -142,6 +158,7 @@ void do_transaction_start(struct connection *conn, struct buffered_data *in)
        /* Attach transaction to input for autofree until it's complete */
        trans = talloc(in, struct transaction);
        INIT_LIST_HEAD(&trans->changes);
+       INIT_LIST_HEAD(&trans->changed_domains);
        trans->generation = generation;
        trans->tdb_name = talloc_asprintf(trans, "%s.%p",
                                          xs_daemon_tdb(), trans);
@@ -172,6 +189,7 @@ void do_transaction_start(struct connection *conn, struct buffered_data *in)
 void do_transaction_end(struct connection *conn, const char *arg)
 {
        struct changed_node *i;
+       struct changed_domain *d;
        struct transaction *trans;
 
        if (!arg || (!streq(arg, "T") && !streq(arg, "F"))) {
@@ -204,6 +222,10 @@ void do_transaction_end(struct connection *conn, const char *arg)
                /* Don't close this: we won! */
                trans->tdb = NULL;
 
+               /* fix domain entry for each changed domain */
+               list_for_each_entry(d, &trans->changed_domains, list)
+                       domain_entry_fix(d->domid, d->nbentry);
+
                /* Fire off the watches for everything that changed. */
                list_for_each_entry(i, &trans->changes, list)
                        fire_watches(conn, i->node, i->recurse);
@@ -212,6 +234,38 @@ void do_transaction_end(struct connection *conn, const char *arg)
        send_ack(conn, XS_TRANSACTION_END);
 }
 
+void transaction_entry_inc(struct transaction *trans, unsigned int domid)
+{
+       struct changed_domain *d;
+
+       list_for_each_entry(d, &trans->changed_domains, list)
+               if (d->domid == domid) {
+                       d->nbentry++;
+                       return;
+               }
+
+       d = talloc(trans, struct changed_domain);
+       d->domid = domid;
+       d->nbentry = 1;
+       list_add_tail(&d->list, &trans->changed_domains);
+}
+
+void transaction_entry_dec(struct transaction *trans, unsigned int domid)
+{
+       struct changed_domain *d;
+
+       list_for_each_entry(d, &trans->changed_domains, list)
+               if (d->domid == domid) {
+                       d->nbentry--;
+                       return;
+               }
+
+       d = talloc(trans, struct changed_domain);
+       d->domid = domid;
+       d->nbentry = -1;
+       list_add_tail(&d->list, &trans->changed_domains);
+}
+
 void conn_delete_all_transactions(struct connection *conn)
 {
        struct transaction *trans;

diff --git a/tools/xenstore/xenstored_transaction.h b/tools/xenstore/xenstored_transaction.h
index ecbae47f2d6fb4f479ecfdfb6bc20985750ec8e9..b3cc9ac4b7cf5c70eec93876177977bebcde406e 100644 (file)
--- a/tools/xenstore/xenstored_transaction.h
+++ b/tools/xenstore/xenstored_transaction.h
@@ -27,6 +27,10 @@ void do_transaction_end(struct connection *conn, const char *arg);
 
 struct transaction *transaction_lookup(struct connection *conn, uint32_t id);
 
+/* inc/dec entry number local to trans while changing a node */
+void transaction_entry_inc(struct transaction *trans, unsigned int domid);
+void transaction_entry_dec(struct transaction *trans, unsigned int domid);
+
 /* This node was changed: can fail and longjmp. */
 void add_change_node(struct transaction *trans, const char *node,
                      bool recurse);